Revision: tlacontrib--aba--1.2--patch-83
Archive: aaron.bentley@utoronto.ca--tla-2004
Creator: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Mon Mar 15 10:11:05 EST 2004
Standard-date: 2004-03-15 15:11:05 GMT
Modified-files: aba/commands/merge
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-83
Summary: Made merge do a log-for-merge even if there were conflicts
Keywords: 

